From 431906aec271735ffbfa1e8aaf90fc8bcc89598d Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Mon, 15 Nov 2021 14:01:23 +0100
Subject: Improved www examples.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
src/main.cpp | 2 +-
wwwroot/blog/index.html | 11 +++++++++--
wwwroot/index.html | 7 +++++++
wwwroot/inherit/00_base.tmpl | 7 +++++--
wwwroot/inherit/index.html | 9 +++++++--
wwwroot/pages/index.md | 3 ++-
6 files changed, 31 insertions(+), 8 deletions(-)
(limited to '*')
diff --git a/src/main.cpp b/src/main.cpp
index e5171ab..0555d4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@ int main(int argc, char ** argv)
if (argc <= 1 || argc > 5)
{
- std::cout << "usage: cpp-web [HOST] [PORT] [WWWROOT]" << std::endl;
+ std::cout << "usage: cpp-web [HOST] [PORT] [WWWROOT]" << std::endl << std::endl;
if (argc > 5)
{
return 1;
diff --git a/wwwroot/blog/index.html b/wwwroot/blog/index.html
index a4c520a..e837780 100644
--- a/wwwroot/blog/index.html
+++ b/wwwroot/blog/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><body>
<p>
<b>blabla</b>
@@ -8,7 +9,7 @@ Test RetFN.: <b>{{ test_return_true }}</b><br><br><br>
## for entry in blog_listing
<tr>
<td>{{ loop.index1 }}</td>
- <td>{{ entry.filename }}</td>
+ <td><a href="{{ entry.filename }}">{{ entry.filename }}</a></td>
<td>{{ entry.title }}</td>
<td>{{ entry.tags }}</td>
<td>{{ entry.author }}</td>
@@ -16,12 +17,18 @@ Test RetFN.: <b>{{ test_return_true }}</b><br><br><br>
<td>{{ entry.publishDate }}</td>
<td>{{ entry.published }}</td>
<td>
- {{ indent(entry.content, 12, false, false) }}
+{{ indent(entry.content, 12, false, false) }}
</td>
<td>{% if loop.is_last == false %}more{% else %}eof{% endif %}<br>
</tr>
## endfor
</table>
{% endif %}
+## if exists("blog_post")
+ <a href="{{ blog_post.filename }}">{{ blog_post.title }}</a><br>
+ {{ blog_post.publishDate }} by {{ blog_post.author }}<br>
+
+{{ indent(blog_post.content, 4, false, false) }}
+## endif
</p>
</body></html>
diff --git a/wwwroot/index.html b/wwwroot/index.html
index 07dd49d..8df5563 100644
--- a/wwwroot/index.html
+++ b/wwwroot/index.html
@@ -1,5 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><body>
<b>INDEX TMPL</b>
{{ uri }}<br>
{{ indent(content, 4, false, false) }}
+ <br>
+ <a href="/blog">blog</a><br>
+ <a href="/inherit">blog-with-tmpl-inheritance</a><br>
+ <a href="/static">static</a><br>
+ <a href="/static/test.txt">/static/test.txt</a><br>
+ <a href="/nonexistant">nonexistant url</a><br>
</body></html>
diff --git a/wwwroot/inherit/00_base.tmpl b/wwwroot/inherit/00_base.tmpl
index c1af32e..80b6850 100644
--- a/wwwroot/inherit/00_base.tmpl
+++ b/wwwroot/inherit/00_base.tmpl
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html>
<head>
{% block head %}
@@ -6,6 +6,9 @@
{% endblock %}
</head>
<body>
- <div>{% block content %}{% endblock %}</div>
+ <div>
+ {% block content %}
+ {% endblock %}
+ </div>
</body>
</html>
diff --git a/wwwroot/inherit/index.html b/wwwroot/inherit/index.html
index a717e4f..8824f78 100644
--- a/wwwroot/inherit/index.html
+++ b/wwwroot/inherit/index.html
@@ -17,7 +17,7 @@
## for entry in blog_listing
<tr>
<td>{{ loop.index1 }}</td>
- <td>{{ entry.filename }}</td>
+ <td><a href="{{ entry.filename }}">{{ entry.filename }}</a></td>
<td>{{ entry.title }}</td>
<td>{{ entry.tags }}</td>
<td>{{ entry.author }}</td>
@@ -25,11 +25,16 @@
<td>{{ entry.publishDate }}</td>
<td>{{ entry.published }}</td>
<td>
- {{ indent(entry.content, 12, false, false) }}
+{{ indent(entry.content, 16, false, false) }}
</td>
<td>{% if loop.is_last == false %}more{% else %}eof{% endif %}<br>
</tr>
## endfor
</table>
{% endif %}
+## if exists("blog_post")
+ <a href="{{ blog_post.filename }}">{{ blog_post.title }}</a><br>
+ {{ blog_post.publishDate }} by {{ blog_post.author }}<br>
+{{ indent(blog_post.content, 4, false, false) }}
+## endif
{% endblock %}
diff --git a/wwwroot/pages/index.md b/wwwroot/pages/index.md
index 99bd385..60d3b64 100644
--- a/wwwroot/pages/index.md
+++ b/wwwroot/pages/index.md
@@ -1,2 +1,3 @@
-*Just HTML*
+*Just HTML rendered from Markdown by md4c*
+
~~plaintext~~
--
cgit v1.2.3